Clean up and remove this shit for now