bug fix: Remove unneccessary code