Removed some artifacts in code