deleting some unused code, cleaning up syntax