Removed test code / Added startup-links